Skip to content

[pull] main from tldraw:main#526

Merged
pull[bot] merged 4 commits intocode:mainfrom
tldraw:main
May 1, 2026
Merged

[pull] main from tldraw:main#526
pull[bot] merged 4 commits intocode:mainfrom
tldraw:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented May 1, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

angrycaptain19 and others added 4 commits May 1, 2026 09:30
Updates the next section of the releases and adds a section to the top
of the releases page explaining our different types of releases
In order to make `GeoShapeUtil.configure()` actually ignore colliding
`customGeoTypes` keys, this PR strips the colliding entries out of the
options before delegating to `super.configure()`. Follow-up to review
feedback on #8705.

Previously, the dev-mode warning said the colliding key would be
ignored, but only the schema registration was skipped. The colliding
entry still landed in `this.options.customGeoTypes` and was consulted at
runtime in three places that silently changed built-in behavior:

- `toolStates/Pointing.ts` — used the user's `defaultSize` for built-in
geos when drag-creating with no drag.
- `DefaultStylePanelContent.tsx` — filtered the built-in style panel
item out (`STYLES.geo.filter((item) => !customGeoTypes?.[item.value])`)
and replaced its icon.
- `GeoShapeUtil.onDoubleClick` — ran the user's handler on the built-in
geo.

Now the warning matches reality: colliding entries are dropped from the
options object that's stored on the util.

### Change type

- [x] `bugfix`

### Test plan

1. Run the new tests in `GeoShapeUtil.test.tsx`
(`describe('GeoShapeUtil.configure with customGeoTypes')`).

- [x] Unit tests

### Release notes

- Fix `GeoShapeUtil.configure()` so colliding `customGeoTypes` keys are
actually ignored, instead of leaking through to the tool's default size,
the style panel, and the double-click handler.

### Code changes

| Section   | LOC change |
| --------- | ---------- |
| Core code | +11 / -5   |
| Tests     | +51 / -0   |


Made with [Cursor](https://cursor.com)
### Change type

- [ ] `bugfix`
- [ ] `improvement`
- [ ] `feature`
- [ ] `api`
- [x] `other`
@pull pull Bot locked and limited conversation to collaborators May 1, 2026
@pull pull Bot added the ⤵️ pull label May 1, 2026
@pull pull Bot had a problem deploying to bemo-canary May 1, 2026 15:13 Failure
@pull pull Bot merged commit 03c4c61 into code:main May 1, 2026
4 of 7 checks passed
@pull pull Bot had a problem deploying to deploy-production May 1, 2026 15:13 Failure
@pull pull Bot had a problem deploying to deploy-staging May 1, 2026 15:13 Error
@pull pull Bot had a problem deploying to deploy-staging May 1, 2026 15:13 Error
@pull pull Bot had a problem deploying to vsce publish May 1, 2026 15:13 Error
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants